merge trunk
authorK. Handa <handa@gnu.org>
Thu, 18 Jul 2013 12:49:00 +0000 (21:49 +0900)
committerK. Handa <handa@gnu.org>
Thu, 18 Jul 2013 12:49:00 +0000 (21:49 +0900)

Trivial merge